From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 18 Apr 2012 17:07:06 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~2578
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=99c8ec3fbfc439845c29144a61a42a5183441eaf;p=emacs.git

Merge from trunk.
---

99c8ec3fbfc439845c29144a61a42a5183441eaf